* lisp/startup.el (mail-host-address): Doc fix.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 93ae0f12862abcc9eeb713ede2306f63c0d4bf2a..ca07cc360620eee8fad26beab78ecf9cbfb51270 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
+2012-03-27  Glenn Morris  <rgm@gnu.org>
+
+       * startup.el (mail-host-address): Doc fix.
+
 2012-03-26  Stefan Monnier  <monnier@iro.umontreal.ca>
 
        * emacs-lisp/bytecomp.el (byte-compile-constants-vector): Allow more

diff --git a/lisp/startup.el b/lisp/startup.el
index 57d7a74e5ecfbe52ed14393f9d0fb73973524f2f..37e4f550dcdaf4c5e910f5a1d2faffa0d4c3c3bb 100644 (file)
--- a/lisp/startup.el
+++ b/lisp/startup.el
@@ -339,7 +339,9 @@ this variable usefully is to set it while building and dumping Emacs."
          (error "Customizing `site-run-file' does not work")))
 
 (defcustom mail-host-address nil
-  "Name of this machine, for purposes of naming users."
+  "Name of this machine, for purposes of naming users.
+If non-nil, Emacs uses this instead of `system-name' when constructing
+email addresses."
   :type '(choice (const nil) string)
   :group 'mail)